extensions-tool: Rename ENABLED/DISABLED states

Follow the update terminology used by the extension system, in
particular when displaying extension details to the user.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7004

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3073>

diff --git a/subprojects/extensions-tool/man/gnome-extensions.txt b/subprojects/extensions-tool/man/gnome-extensions.txt
index 0d6b5eafff51b9746ff2d73a7e426848ba18a0e9..7fcc3811ed06adfe7bf7b1937a5f7b9dda6f4924 100644 (file)
--- a/subprojects/extensions-tool/man/gnome-extensions.txt
+++ b/subprojects/extensions-tool/man/gnome-extensions.txt
@@ -62,7 +62,7 @@ Prints the program version.
 Enables the extension identified by 'UUID'.
 +
 The command will not detect any errors from the extension itself, use the
-*info* command to confirm that the extension state is *ENABLED*.
+*info* command to confirm that the extension state is *ACTIVE*.
 +
 If the extension is already enabled, the command will do nothing.
 

diff --git a/subprojects/extensions-tool/src/command-list.c b/subprojects/extensions-tool/src/command-list.c
index 62db4d9d3e68189e8a770e6d258846bc3ac6be44..0ed1968eedc2121a6028c56582a90e068e3e20fd 100644 (file)
--- a/subprojects/extensions-tool/src/command-list.c
+++ b/subprojects/extensions-tool/src/command-list.c
@@ -87,10 +87,10 @@ list_extensions (ListFilterFlags filter, DisplayFormat format)
       if (type == TYPE_SYSTEM && (filter & LIST_FLAGS_SYSTEM) == 0)
         continue;
 
-      if (state == STATE_ENABLED && (filter & LIST_FLAGS_ENABLED) == 0)
+      if (state == STATE_ACTIVE && (filter & LIST_FLAGS_ENABLED) == 0)
         continue;
 
-      if (state != STATE_ENABLED && (filter & LIST_FLAGS_DISABLED) == 0)
+      if (state != STATE_ACTIVE && (filter & LIST_FLAGS_DISABLED) == 0)
         continue;
 
       if (!has_prefs && (filter & LIST_FLAGS_NO_PREFS) == 0)

diff --git a/subprojects/extensions-tool/src/common.h b/subprojects/extensions-tool/src/common.h
index 74d789e9163c718ad0c31bfe444e3fd4f36243a5..69efd0527bf798064ec1483bc21c00f5b11b7e93 100644 (file)
--- a/subprojects/extensions-tool/src/common.h
+++ b/subprojects/extensions-tool/src/common.h
@@ -30,14 +30,14 @@ typedef enum {
 } ExtensionType;
 
 typedef enum {
-  STATE_ENABLED = 1,
-  STATE_DISABLED,
+  STATE_ACTIVE = 1,
+  STATE_INACTIVE,
   STATE_ERROR,
   STATE_OUT_OF_DATE,
   STATE_DOWNLOADING,
   STATE_INITIALIZED,
-  STATE_DISABLING,
-  STATE_ENABLING,
+  STATE_DEACTIVATING,
+  STATE_ACTIVATING,
 
   STATE_UNINSTALLED = 99
 } ExtensionState;

diff --git a/subprojects/extensions-tool/src/main.c b/subprojects/extensions-tool/src/main.c
index 327617415f90b98166aaae13697932bae912ede9..56ae4750917c65a4837496146bca53a0924ccf27 100644 (file)
--- a/subprojects/extensions-tool/src/main.c
+++ b/subprojects/extensions-tool/src/main.c
@@ -31,10 +31,10 @@ extension_state_to_string (ExtensionState state)
 {
   switch (state)
     {
-    case STATE_ENABLED:
-      return "ENABLED";
-    case STATE_DISABLED:
-      return "DISABLED";
+    case STATE_ACTIVE:
+      return "ACTIVE";
+    case STATE_INACTIVE:
+      return "INACTIVE";
     case STATE_ERROR:
       return "ERROR";
     case STATE_OUT_OF_DATE:
@@ -43,10 +43,10 @@ extension_state_to_string (ExtensionState state)
       return "DOWNLOADING";
     case STATE_INITIALIZED:
       return "INITIALIZED";
-    case STATE_DISABLING:
-      return "DISABLING";
-    case STATE_ENABLING:
-      return "ENABLING";
+    case STATE_DEACTIVATING:
+      return "DEACTIVATING";
+    case STATE_ACTIVATING:
+      return "ACTIVATING";
     case STATE_UNINSTALLED:
       return "UNINSTALLED";
     }